Results of semistructured (SM) and unstructured merge (UM) in revision : conflicts (C), conflicting lines of code (CL) and semantic conflicts (SC).
Yellow boxes indicate better results of unstructured merge. CM column dislays which kind is selected for combined conflict merge.
| C | CL | SC | CM |
---|
File | UM | SM | UM | SM | UM | SM |
---|
/PluginSDK/Terrain/TerrainDownloadRequest.cs | 2 | 1 | 301 | 104 | -- | 0 | SM |
/PluginSDK/ConfigurationLoader.cs | 2 | 2 | 31 | 31 | -- | 0 | SM |
/PluginSDK/LineFeature.cs | 1 | 1 | 77 | 43 | -- | 0 | SM |
/WorldWind/MeasureToolNG.cs | 1 | 4 | 974 | 238 | -- | 0 | UM |
/WorldWind/WMSBrowserNG.cs | 4 | 7 | 806 | 610 | -- | 0 | UM |
/bin/Debug/Plugins/VirtualEarth/VirtualEarthPlugin.cs | 1 | 13 | 4004 | 1353 | -- | 0 | UM |